bitkeeper revision 1.1159.1.503 (41cad0d4p3J5sYi-_a0Mz6vhaLrL8Q)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 23 Dec 2004 14:06:12 +0000 (14:06 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 23 Dec 2004 14:06:12 +0000 (14:06 +0000)
commit87c161d3c3291b1eb0dcef6048649c2d3a2629de
tree2cb644d1aaeb6b47a5ab42945a1aa362b8f8c736
parent3d0f32e4d95eba6232f5f730f995e390c6548bf8
parent28f33c5460619b6c06c540b008b05dadc77d33a5
bitkeeper revision 1.1159.1.503 (41cad0d4p3J5sYi-_a0Mz6vhaLrL8Q)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig